Use "session.empty?" rather than "session.nil?" in thanks view
Merge remote-tracking branch 'upstream/develop' into develop