Merging commits from snowspeeder

Signed-off-by: Arné Schreuder <arne@consulta.co.za>
Merge branch 'master' of https://github.com/Consulta/cdn
Finalising update

Signed-off-by: Arné Schreuder <arne@consulta.co.za>