master-bc-466

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