laanwj sigs 0.9.0
Luke 0.8.7rc1
Merge remote-tracking branch 'upstream/master'