master-bc-340

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