Merging #develop into #next 

This PR replaces https://github.com/yahoo/mojito/pull/1204