2 plugins updated
Merge branch 'master' into develop

Conflicts:
	wp-content/plugins/akismet/.htaccess
	wp-content/plugins/akismet/_inc/akismet.js
	wp-content/plugins/akismet/akismet.php
	wp-content/plugins/akismet/class.akismet-admin.php
	wp-content/plugins/akismet/class.akismet.php
	wp-content/plugins/akismet/readme.txt
	wp-content/plugins/akismet/views/config.php
	wp-content/plugins/akismet/views/notice.php