master-bc-538

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