Merge for 2017.05-3

username-removed-56100 requested to merge dev into master May 29, 2017