1.6 compatibility
Merge branch 'master' of github.com:andreitognolo/raidenjpa