master-bc-733

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