Merge branch 'prod' into search-save-active

Conflicts:
	page-home.php
	tasks/options/concat.js