Merge branch '1.2-merge-master' into 'master'

1.2 merge master

Closes #158, #160, and #151

See merge request !257
3 jobs for 1.2-resync
in 9 minutes and 36 seconds and was queued for 2 seconds