1.25
Merge branch 'dev'
Merge pull request #1 from evernote/master

Merge from official version