master-bc-261

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