master-bc-287

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