master-bc-268

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