Goto: clean-ups
Merge branch 'Goto-dev' into dev

* Goto-dev:
  Goto: clean-ups
NetherPortal: tweak API level
Merge branch 'NetherPortal-dev' into dev

* NetherPortal-dev:
  NetherPortal: tweak API level