Merge branch 'master' into swift2.3

.travis.yml

@@ -7,9 +7,6 @@ env:
     - TEST_TYPE=iOS
     - TEST_TYPE=OSX
     - TEST_TYPE=tvOS
-before_install:
-- |
-    gem install xcpretty -N --no-ri --no-rdoc
 
 script:
 - |
@@ -28,3 +25,4 @@ after_success:
     if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = OSX ] || [ "$TEST_TYPE" = tvOS ]; then
       bash <(curl -s https://codecov.io/bash)
     fi
+    sleep 5