Merge branch 'GitHub/Julian' Beta 1.2