AUI-1050 - AUI-865 fix master demo
Merge branch 'master' into pull-request-241-AUI-865