master-bc-462

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