master-bc-474

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