Fixed documentation mistake (thanks Robert)
Merge branch 'master' into update-vsites