Merge branch 'master' into debian-wheezy
[snf-image-creator] / docs / _static