Merge branch 'master' into code-generator

Conflicts:
	lib/6to5/register.js

lib/6to5/transform.js

@@ -105,6 +105,7 @@ transform.transformers = {
   forOf:                    require("./transformers/for-of"),
   unicodeRegex:             require("./transformers/unicode-regex"),
   generators:               require("./transformers/generators"),
+  numericLiterals:          require("./transformers/numeric-literals"),
 
   react:                    require("./transformers/react"),
   jsx:                      require("./transformers/jsx"),
@@ -112,9 +113,10 @@ transform.transformers = {
   _aliasFunctions:          require("./transformers/_alias-functions"),
   _blockHoist:              require("./transformers/_block-hoist"),
   _declarations:            require("./transformers/_declarations"),
-  _moduleFormatter:         require("./transformers/_module-formatter"),
 
-  useStrict:                require("./transformers/use-strict")
+  useStrict:                require("./transformers/use-strict"),
+
+  _moduleFormatter:         require("./transformers/_module-formatter")
 };
 
 transform.moduleFormatters = {