Merge upstream/master 0.4.5