Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-13-15-51-23