Merge remote-tracking branch 'github/master' into master-apache
authorSimeon Aladjem <simeon.aladjem@miracl.com>
Wed, 21 Sep 2016 14:31:16 +0000 (17:31 +0300)
committerSimeon Aladjem <simeon.aladjem@miracl.com>
Wed, 21 Sep 2016 14:31:16 +0000 (17:31 +0300)

Trivial merge