Occupation parsing in wiki markup.
Merge branch 'master' into development