Merge branch 'dev' into release-0.2

Merging in the updating of abacus submodule ref from dev branch.