Upgraded Jackson mapper
Merge branch 'master' into angularjs