Browse for folder fix...
Merge branch 'master' into development