WP 4.0 stable

Oops...somehow it tracked master and automatically updated to 4.1. We need to prevent this by ALWAYS commiting to another branch and do a pull request at Github. Github flow!!!!