Merge branch 'master' into development

Conflicts:
	packages/babel/src/generation/generators/flow.js
	packages/babel/src/generation/generators/types.js
	packages/babel/src/transformation/transformers/es6/for-of.js
	packages/babel/src/traversal/path/inference/inferers.js
	packages/babel/src/types/index.js
	packages/babel/src/util.js
	packages/babel/test/util.js

packages/babel-cli/src/babel-plugin/templates/index.js

@@ -1,3 +1,4 @@
+/* eslint no-unused-vars:0 */
 export default function ({ Plugin, types: t }) {
   return new Plugin("NAME", {
     visitor: {