master-bc-259

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