Spring 4.1 upgrade

Deals with #686