master-bc-490

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