1st commit 20130216, 13:51
Merge remote-tracking branch 'origin/master'