master-bc-475

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