UPDATE: PHP core and WP plugin updates

@markewallace - Hi Mark. Here some changes to the plugin and core. (line endings changed too).