Update admin-edit.php
Merge pull request #564 from sphoto/patch-19

Update admin-edit.php
Update admin-functions.php
Merge pull request #565 from sphoto/patch-20

Update admin-functions.php
Merge remote-tracking branch 'origin/master' into 1.4.6