Merge remote-tracking branch 'github-miracl/master'
authorSimeon Aladjem <simeon.aladjem@miracl.com>
Fri, 25 Nov 2016 16:06:13 +0000 (18:06 +0200)
committerSimeon Aladjem <simeon.aladjem@miracl.com>
Fri, 25 Nov 2016 16:06:13 +0000 (18:06 +0200)

Trivial merge