master-bc-525

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