version 2014-11-20_34
Merge remote-tracking branch 'origin/master'