master-bc-532

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