Merge remote-tracking branch 'upstream/master' into 5.4.0-conformance

# Conflicts:
#	package.json

android/src/main/java/com/horcrux/svg/SvgPackage.java

@@ -53,4 +53,8 @@ public class SvgPackage implements ReactPackage {
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         return Collections.<NativeModule>singletonList(new SvgViewModule(reactContext));
     }
+
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return Collections.emptyList();
+    }
 }

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "5.3.3",
+    "version": "5.4.1",
     "name": "react-native-svg",
     "description": "SVG library for react-native",
     "repository": {