fix-nightly-2016-07-15 master