master-bc-543

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