am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev

* commit '594eeb082e548617ff5092496888c43457593c2b':
  Fix for the invalid Global Proxy Setting