More optimal int->tuple tuple->int operations
Allow None in DecimalField
Merge branch 'develop'