v0.5.0.1, merged 'devel'