master-bc-432

http://issues.liferay.com/browse/LIFERAYQA-4255