master-bc-299

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