master-bc-292

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