Merge branch 'master' into dev
Another fix for a merge to keep the options separate.
Fixed a minor typo in the SITEURL, caused by the many merges.
Began draft of an article on VSAN training.
Reverting smothering from dev...