Pulling Pieter Kitslaar's commits. Thanks!