instructions now specify branching off devel
Merge branch 'devel' into feature-labelname