Manually adding PR #740
Merge branch 'master' of https://github.com/boundlessgeo/suite