Merge branches 'master' and 'dev' into dev
Fixes the symlink
Merge branches 'master' and 'dev'