Merge remote-tracking branch 'ptahpeteh/patch-1' into mbedtls-1.3

* ptahpeteh/patch-1:
  Serious bug fix in entropy.c