Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-30-23-34-40