commit 2014-06-17 21-45
Merge remote-tracking branch 'origin/master'