first commit (but actually written in 20140731)
Merge remote-tracking branch 'origin/master'