Rupert Smith Merge branch 'elm18'

Latest commit 651200b

Dec 1, 2016