manual ready to go for 2.2.0, completing issue #485