Round one of bug fixes for post-process
Merge branch 'jelle'