Merge remote-tracking branch 'origin' into anehmer/restapi