Merge remote-tracking branches 'origin/development', 'origin/HEAD', 'origin/master' and 'origin/types'