Oops, it's not a var… :)
Merge branch 'gh-pages' into localization