Python defaults arguments are hard.
Merge pull request #1598 from Lukasa/defaults

[2.0] Python default arguments are hard