Merge branch 'v3.0.x' into patch-3
authorAlan Buxey <alan.buxey@gmail.com>
Tue, 9 May 2017 11:28:07 +0000 (12:28 +0100)
committerGitHub <noreply@github.com>
Tue, 9 May 2017 11:28:07 +0000 (12:28 +0100)
commit9b7eaf2a2dabce30320b1d033edbff2ee36486b4
tree116f00947a06d451da3395f36acca213bea047d8
parent1a5df2a0b5d39b2106cd6f9075a396779bcd9dce
parentd46f6ebc2f7b4ac224beb898409197574ab8ae6a
Merge branch 'v3.0.x' into patch-3