created on 2014-06-25 21:18:18
Merge remote-tracking branch 'origin/master'