Luke 0.8.4
Merge remote-tracking branch 'upstream/master'