Fix #2840 - textfield binding issue with null
Merge pull request #2841 from mitchlloyd/master

Fix #2840 - textfield binding issue with null