am 5fca38c5: Merge "Small performance improvement / minor bugfix"

* commit '5fca38c538bd57639f70332b7f73919acac18a86':
  Small performance improvement / minor bugfix