0.4.0_[2014-12-14.151723]
Merge remote-tracking branch 'origin/master' into dev_CB