Initial fork and upgraded spring security to 3.1.3