Typo in regex causes runtime error
Merge remote branch 'upstream/master'
relevant now that site statistics are all the hotness
Allows extra content to be inserted at end of profile_photo page. Needed for openclipatar addon.
Merge pull request #605 from habeascodice/master

2 minor bug-fixes, a line of docu, and a call_hooks() hook
Merge from master