master-bc-434

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