edit-24/09/14-11:10
Merge remote-tracking branch 'origin/master'