Merge branch 'dev'
Unused reference removed.
Merge branch 'master' into dev