Merge branch 'refs/heads/master' into develop
remove reference to old method
Merge branch 'refs/heads/develop'