Changed to upstream
Changes from last pull-request