master-bc-738

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