start working on 0.1.5
Merge remote-tracking branch 'upstream/master' into ENYO-2466