master-bc-530

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