Regexp fix
Merge branch 'master' of github.com:DDeis/Windmeal
Automerge
Merge branch 'master' of github.com:DDeis/Windmeal
Automerge