Merge branch 'master' into prod

Conflicts:
	library/Zend/Http/Header/AbstractAccept.php

Change-Id: I3c717518144fe2f02ae57dc5d71e80ff3aa7e55b