master-bc-290

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