Merge branch 'release/0.5.0'
Merge branch 'release/0.6.0'
Merge tag 'rel-0.6.0' into develop

Tagged rel-0.6.0