moved warning into the right place
Merge branch 'master' into mb/rls
Merge branch 'mb/rls'