Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-21-12-07-36