release 0.5.5 (based on 0.5.4-165-g4b776c4)
Merge remote-tracking branch 'up/develop' into tests