master-bc-267

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