Merge branch 'apache_template' into pebkac