rename CONFIGURE-wp-config.php to something that doesn't cause a WP engine error
Merge branch 'master' into plugins
Merge branch 'master' into theme-jer
Merge branch 'plugins' into theme-jer