master-bc-549

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