master-bc-264

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