Merge upstream changes #3

Merged
merged 15 commits into from Oct 4, 2013