master-bc-364

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