master-bc-321

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