master-bc-501

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