Merge branch 'release/3.1.3' into develop
Changed hook api to require next to avoid conflict with coffeescript implicit return.
Merge branch 'master' into develop
Fixed index again
Bumped version
Merge branch 'release/3.1.4'