master-bc-331

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