master-bc-357

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