master-bc-465

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