DATAGRAPH-458 & DATAGRAPH-460 : Spring 4.X compatibility
Merge pull request #175 from nickithewatt/DATAGRAPH-458-460-for-3.0.x

DATAGRAPH-458 & DATAGRAPH-460 : Spring 4.X compatibility