Merge branch 'development'
Merge remote-tracking branch 'upstream/master' into development
Merge branch 'development' of https://github.com/tarvidsson/C-API into development