master-bc-328

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