Merge branch 'master' into extensions

Conflicts:
	objects.js

1 files changed, 4 insertions, 1 deletions

diff --git a/morphic.js b/morphic.js
index b55b180..7d1f53d 100644
--- a/morphic.js
+++ b/morphic.js
@@ -1035,7 +1035,7 @@
 /*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
 FileList, getBlurredShadowSupport*/
 
-var morphicVersion = '2014-February-03';
+var morphicVersion = '2014-May-20';
 var modules = {}; // keep track of additional loaded modules
 var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
 
@@ -10268,6 +10268,9 @@ WorldMorph.prototype.initEventListeners = function () {
                 }
                 event.preventDefault();
             }
+            if (event.ctrlKey || event.metaKey) {
+                event.preventDefault();
+            }
         },
         false
     );