Merge remote-tracking branch 'origin/4.4' into 4.4-4.5-2014-09-14-13-58-42