Merge remote-tracking branch 'jgallagher/master' into 2018

# Conflicts:
#	src/lib.rs
#	src/statement.rs

src/vtab/mod.rs

@@ -467,6 +467,8 @@ impl<'a> Values<'a> {
                 Error::FromSqlConversionFailure(idx, value.data_type(), err)
             }
             FromSqlError::OutOfRange(i) => Error::IntegralValueOutOfRange(idx, i),
+            #[cfg(feature = "i128_blob")]
+            FromSqlError::InvalidI128Size(_) => Error::InvalidColumnType(idx, value.data_type()),
         })
     }