Fixes fatal error regarding {% load url from future %} missing from a template file
Merge branch 'master' into web-appliance-context