Third run
Merge branch 'v2' of github.com:bigfootproject/OSMEF into v2