diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
index a80203709..2a56593d3 100644
--- a/.meteor/.finished-upgraders
+++ b/.meteor/.finished-upgraders
@@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
 1.4.0-remove-old-dev-bundle-link
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
diff --git a/.meteor/release b/.meteor/release
index 605b4e1f0..025f64e70 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.4.1
+METEOR@1.5
diff --git a/packages/_boilerplate-generator/package.js b/packages/_boilerplate-generator/package.js
index 2496d96db..50d72666b 100644
--- a/packages/_boilerplate-generator/package.js
+++ b/packages/_boilerplate-generator/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "boilerplate-generator",
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11'
+  version: '1.1.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/_buffer/buffer.js b/packages/_buffer/buffer.js
new file mode 100644
index 000000000..f0f2b2567
--- /dev/null
+++ b/packages/_buffer/buffer.js
@@ -0,0 +1 @@
+global.Buffer = global.Buffer || require("buffer").Buffer;
\ No newline at end of file
diff --git a/packages/_buffer/package.js b/packages/_buffer/package.js
new file mode 100644
index 000000000..871a62875
--- /dev/null
+++ b/packages/_buffer/package.js
@@ -0,0 +1,15 @@
+Package.describe({
+  name: "buffer"
+});
+
+Package.onUse( function(api) {
+  
+  api.use([
+    'ecmascript'
+  ]);
+
+  api.addFiles([
+    'buffer.js'
+  ], ['client']);
+
+});
diff --git a/packages/vulcan-core/lib/modules/components/Layout.jsx b/packages/vulcan-core/lib/modules/components/Layout.jsx
index 2040ee4fe..45b6add96 100644
--- a/packages/vulcan-core/lib/modules/components/Layout.jsx
+++ b/packages/vulcan-core/lib/modules/components/Layout.jsx
@@ -1,4 +1,4 @@
-import { Components, registerComponent } from 'meteor/vulcan:core';
+import { Components, registerComponent } from 'meteor/vulcan:lib';
 import React from 'react';
 
 const Layout = ({children}) =>
diff --git a/packages/vulcan-forms-tags/lib/components/Tags.jsx b/packages/vulcan-forms-tags/lib/components/Tags.jsx
index b1139d4bb..49f1f9540 100644
--- a/packages/vulcan-forms-tags/lib/components/Tags.jsx
+++ b/packages/vulcan-forms-tags/lib/components/Tags.jsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import FRC from 'formsy-react-components';
 import ReactTagInput from 'react-tag-input';
+import PropTypes from 'prop-types';
 
 const ReactTags = ReactTagInput.WithContext;
 
diff --git a/packages/vulcan-forms/lib/Form.jsx b/packages/vulcan-forms/lib/Form.jsx
index 29cb53e15..0006b79e6 100644
--- a/packages/vulcan-forms/lib/Form.jsx
+++ b/packages/vulcan-forms/lib/Form.jsx
@@ -23,7 +23,8 @@ This component expects:
 */
 
 import { Components, Utils, runCallbacks } from 'meteor/vulcan:core';
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { FormattedMessage, intlShape } from 'react-intl';
 import Formsy from 'formsy-react';
 import { Button } from 'react-bootstrap';
@@ -449,7 +450,7 @@ class Form extends Component {
 
     // run data object through submitForm callbacks
     data = runCallbacks(this.submitFormCallbacks, data);
-    
+
     const fields = this.getFieldNames();
 
     // if there's a submit callback, run it
diff --git a/packages/vulcan-lib/package.js b/packages/vulcan-lib/package.js
index 7aa5a9726..33221d938 100644
--- a/packages/vulcan-lib/package.js
+++ b/packages/vulcan-lib/package.js
@@ -11,6 +11,8 @@ Package.onUse(function (api) {
 
   var packages = [
 
+    'buffer', // see https://github.com/meteor/meteor/issues/8645
+
     // Meteor packages
 
     'meteor-base',
diff --git a/yarn.lock b/yarn.lock
index 2d0b08c12..39b85ebb1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1920,11 +1920,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7"
-
-he@^1.1.1:
+he@^1.0.0, he@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -2067,6 +2063,12 @@ immutability-helper@^2.0.0:
   dependencies:
     invariant "^2.2.0"
 
+import@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/import/-/import-0.0.6.tgz#d0eb79df86aa2677c6db61578a5212b3031e6042"
+  dependencies:
+    optimist "0.3.x"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -2296,6 +2298,10 @@ js-tokens@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
 
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
 js-yaml@^3.5.1:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -2471,6 +2477,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0:
   dependencies:
     js-tokens "^2.0.0"
 
+loose-envify@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
 lru-cache@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -2762,6 +2774,12 @@ optics-agent@^1.0.5:
     protobufjs-no-cli "^5.0.1"
     request "^2.74.0"
 
+optimist@0.3.x:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
+  dependencies:
+    wordwrap "~0.0.2"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -2962,6 +2980,13 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.10:
+  version "15.5.10"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+
 prop-types@^15.5.8:
   version "15.5.8"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"