Merge remote-tracking branch 'upstream/microupdate' into...

Merge remote-tracking branch 'upstream/microupdate' into merge-microupdate-into-master20160810-173810