Merge branch 'internal-dev' into 'master'

2018.07.27 release

Closes #57 and #62

See merge request github/killerbeez!60

Merge branch 'internal-dev' into 'master'

Public release

See merge request github/Killerbeez!35