Merging my commits from julian's repository to matt's.