Merge branch 'master' into childrenAsObject

Author: Javier Morant

package.json

@@ -46,7 +46,7 @@
     "jest": "^22.4.2",
     "prettier": "^1.7.0",
     "prettier-eslint": "^8.2.1",
-    "react-test-renderer": "16.3.0",
+    "react-test-renderer": "16.3.1",
     "ts-jest": "^22.4.1",
     "tslint": "^5.9.1",
     "typescript": "^2.7.2"