Merge remote-tracking branch 'smcv/umask-keywords'