Combined with 2.0.0-wip branch

Also added the 1.2.4 change, so should work with both Wordpress and Github downloads.