Pre-merge commit.
Merge remote-tracking branch 'origin/master'
Fixed error in REST-api.