[issue 1060] Changes refer to https://github.com/yahoo/mojito/issues/1060