master-bc-460

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