fixed issue
Merge branch 'master' into share_via_email