Merge pull request #1 from ZenPhoto20/master

update from master stream 2014/11/04
Merge pull request #2 from ZenPhoto20/master

2014-11-07
Merge pull request #199 from sbillard/master

11.7.2014
Merge pull request #201 from sbillard/master

11.7b.2014
Merge pull request #202 from sbillard/master

fix #200
Merge pull request #203 from sbillard/master

handle NULL option
Merge pull request #205 from sbillard/master

11.8a.2014
Merge pull request #3 from ZenPhoto20/master

2014-11-09
cleanup of password redirect

SEO_WEBPATH is already part of $action
Merge pull request #207 from Jens2014/master

cleanup of password redirect
Merge remote-tracking branch 'upstream/master'
11.9a.2014