master-bc-741

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