Had the ordering of redirections the wrong way around. Whoops
Merge branch 'develop' into release/12.0