workaround for browsers without Object.keys
Merge branch 'master' into gh-pages