master-bc-269

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