add dnw's github.com/spring/spring/pull/77
Resolve conflict with dev branch
Merge branch 'develop' of git://github.com/spring/spring.git into DnW