Merge tag '0.6' into develop

0.6
Merge tag 'priority' into develop

0.6.1
New upstream release
bump 0.7
Merge branch 'release/0.7'