Added "origin" to the available options
Merge branch 'upstream'