master-bc-335

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