Merge branch 'devel' into timezone

.all-contributorsrc

@@ -157,7 +157,8 @@
       "profile": "https://github.com/cgoveas",
       "contributions": [
         "doc",
-        "bug"
+        "bug",
+        "maintenance"
       ]
     },
     {