Merging #develop into #next

Bringing #next up to date with the latest #develop commits.

This is a prerequisite prior to merging PR#1101 (https://github.com/yahoo/mojito/pull/1101)