1441 partial fix when inputting invalid characters on date field
Merge remote-tracking branch 'technowar/develop' into develop

* technowar/develop:
  1441 partial fix when inputting invalid characters on date field