cc branch #229

Merged
merged 17 commits into from Sep 6, 2012