master-bc-396

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