Unquote default
Merge branch 'master' into grunt-tasks