Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39