fix compile
no crappy unions bitte
Merge branch 'develop' of github.com:spring/spring into develop