Fix to friendly url mapping that caused parent to be lost
Merge branch 'refs/heads/master' into april_tasks