Merge branch 'master' into issue_269_c_blosc_upgrade

Author: joshmoore

docs/release.rst

@@ -6,6 +6,14 @@ Release notes
 Unreleased
 ----------
 
+.. _release_0.8.1:
+
+0.8.1
+-----
+
+* Fix an ImportError with Blosc on Android.
+  By :user:`Daniel Jewell <danieldjewell>`, :issue:`284`.
+
 .. _release_0.8.0:
 
 0.8.0

numcodecs/blosc.pyx

@@ -79,6 +79,8 @@ try:
     mutex = multiprocessing.Lock()
 except OSError:
     mutex = None
+except ImportError:
+    mutex = None
 
 # store ID of process that first loads the module, so we can detect a fork later
 _importer_pid = os.getpid()