Merge branch 'wordpress-setup-for-public'