Merge branch 'shana/build' into beta-1.0.12

shana · shana · commit 890642f15b0e · 2015-08-05T11:48:17.000-07:00
diff --git a/script b/script
@@ -1 +1 @@
-Subproject commit 21d731f025ca1a596a469e80a4c44ac161321388
+Subproject commit 7ee5265a5d86f02efa95a10bc2ebea50ab0f6d04
