merge from master
Merge branch 'intent-test' of github.com:muczy/ShareToEmail into intent-test