This has been introduced in 2.5, so when upgrading from previous versions make sure we set a default value. Otherwise, we get a notice about it being undefined when we try to use it (and we always try to use it!).
