Merge branches 'wip' and 'master'
Merge branches 'master' and 'wip'
Support single quotes
Merge branches 'wip' and 'master' into wip