Sammi 2014 11 12
Merge remote-tracking branch 'origin/master'