Exceptions added
Merge remote-tracking branch 'origin/master'
New method setModifiedForFileURI in Android too
Merge remote-tracking branch 'origin/master'