2014.12.30
Merge remote-tracking branch 'origin/master'