Fix for abacus export (refs: #590)
Merge remote-tracking branch 'origin/dev' into dev