updated to the correct version of external-jackson
Merge origin/master