master-bc-684

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