Merge remote-tracking branch 'miracl/master'