Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-13-16-09-07