Merge branch 'fix-jquery-route' into node-10
authorTravis Webb <me@traviswebb.com>
Tue, 26 Aug 2014 21:50:39 +0000 (17:50 -0400)
committerTravis Webb <me@traviswebb.com>
Tue, 26 Aug 2014 21:50:39 +0000 (17:50 -0400)

Trivial merge