master-bc-260

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