2.3.1

David Morley

@dmorley

365a3644 · Merge branch 'develop' into 'master' · Aug 05, 2018

minor to fix 2 bugs and some cleanup