Fix config manager. Return type value, default or None
Merge remote-tracking branch 'origin/master'

* origin/master:
  cambios varios