Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-10-15-41-33