am 892f1b46: am 63e442cf: am 5fca38c5: Merge "Small performance improvement / minor bugfix"

* commit '892f1b46d5de1d8936efd117419ef71c87e4f425':