from tsan 2014-12-26_1704
Merge remote-tracking branch 'origin/master'