master-bc-472

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