master-bc-350

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