REST conform API v1.1
Config
Merge remote-tracking branch 'origin/master'