master-bc-458

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