Merge from production

VERSION.md

@@ -1 +1 @@
-3.31.3
+3.31.4

mopidy_iris/__init__.py

@@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler
 from core import IrisCore
 
 logger = logging.getLogger(__name__)
-__version__ = '3.31.3'
+__version__ = '3.31.4'
 
 ##
 # Core extension class

mopidy_iris/static/index.html

@@ -98,8 +98,13 @@
 
 	// Release details
 	// These are automatically injected to built HTML
+<<<<<<< HEAD
 	var build = "1544816038";
 	var version = "3.31.3";
+=======
+	var build = "1544834547";
+	var version = "3.31.4";
+>>>>>>> master
 
 	// Construct the script tag
     var js = document.createElement("script");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.31.3",
+  "version": "3.31.4",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",