Merge branch 'barrier-insertion-near-top-of-loop' into 'master'

Fix barrier insertion above top of loop (Fixes #17 on gitlab)

See merge request !73