master-bc-493

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