add nil as synonym for None
Merge branch 'master' onto pr/395