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