updates
Merge remote-tracking branch 'origin/turbolinks' into turbolinks