2014.11.27-1:54
Merge remote-tracking branch 'origin/master'