Merge branch 'hotfix/allow_null_set_options'
Don't free the key before we use it
Fixes #408
Merge branch 'hotfix/incrby_float_prefix' into develop

Fixes #408