Issue: SPR-10906 and Issue: SPR-5839 


Juergen Hoeller	 Issue: SPR-10906 …	46131aa

samuelteixeiras	Merge branch 'master' of github.com:samuelteixeiras/spring-framework	3590f26

samuelteixeiras	 Issue: SPR-10906 …	db4efc3

samuelteixeiras	Merge branch 'master' of github.com:samuelteixeiras/spring-framework	2a9d863

samuelteixeiras	 Issue: SPR-10906 …	e3db449

samuelteixeiras	Merge branch 'master' of github.com:samuelteixeiras/spring-framework	bd76bd5

samuelteixeiras	 Issue: SPR-5839 …	f9d66af

samuelteixeiras	Merge branch 'master' of github.com:samuelteixeiras/spring-framework	2ef4ae0