Ghetto rebase Heimes' changes onto the 0.13 release branch
4 files changed