add support for null values
Merge remote-tracking branch 'cm-rudolph/master' into cm-rudolph-master