Do not use raw values from superglobal.
Merge branch 'ascraeus' into develop

* ascraeus:
  Do not use raw values from superglobal.