master-bc-318

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