consolidated 2 references to .content
Merge branch 'v2.0' of https://github.com/petebot/cpn-sl into v2.0