Merge branch 'dev-master' into dev-3.x
Added Node 0.10 to travis build
Restore form attributes after successful upload in io-upload-iframe

Fixes #2533186