Merge pull request #1 from quad9/master

7月8日朝の変更をeffe1の方でマージしたい案件
会社でマージ出来る事を確認。
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
do merge commit
modified: app/views/sessions/new.html.haml, spec/requests/authentication_pages_spec.rb
Merge pull request #2 from effe1/master

140820会社での訂正