Correctly encode came_from for inline login (Fixes #340)
Merge remote branch 'origin/master'