2014/12/03 15/10
Merge remote-tracking branch 'github/master'