Branch ported from internal.
Should work identically to what it was before, but will no longer be annoying to type when coding! :p