master-bc-621

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