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

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

src/transaction.rs

@@ -1,11 +1,6 @@
 use crate::{Connection, Result};
 use std::ops::Deref;
 
-/// Old name for `TransactionBehavior`. `SqliteTransactionBehavior` is
-/// deprecated.
-#[deprecated(since = "0.6.0", note = "Use TransactionBehavior instead")]
-pub type SqliteTransactionBehavior = TransactionBehavior;
-
 /// Options for transaction behavior. See [BEGIN
 /// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details.
 #[derive(Copy, Clone)]
@@ -32,10 +27,6 @@ pub enum DropBehavior {
     Panic,
 }
 
-/// Old name for `Transaction`. `SqliteTransaction` is deprecated.
-#[deprecated(since = "0.6.0", note = "Use Transaction instead")]
-pub type SqliteTransaction<'conn> = Transaction<'conn>;
-
 /// Represents a transaction on a database connection.
 ///
 /// ## Note