master-bc-272

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