Merged master into chris/refinement-cleanup
Fix old<->new facet mapping
Merge branch 'chris/refinement-cleanup' into next