Fixed #694: Calling move() twice on the same uploaded file will cause a bogus exception
merge 845b87a2c28ed58c4c372fbc4ebdb5205cb55547