Split notion of default args into optional and if_none
Merge branch 'master' into mammoth