yet another fucking fix to the hack
Merge commit 'grassy-knoll.r16.em' into integration