Merged in the Projectiles branch.
Although the projectiles are not yet finished, the branch has several bugfixes that are needed in master as well.
This commit is contained in:
Although the projectiles are not yet finished, the branch has several bugfixes that are needed in master as well.