Merge branch 'master' of github.com:openlayers/ol3 into vector

build/ol-whitespace.json

@@ -33,5 +33,7 @@
   // Note: we can't have a (function(){%output%})() output wrapper with
   // WHITESPACE and SIMPLE modes. See this link for explanations:
   // https://groups.google.com/forum/#!topic/plovr/gQyZEa2NpsU
-  "output-wrapper": "%output%"
+  "output-wrapper": "%output%",
+
+  "pretty-print": true
 }