Merge remote-tracking branch 'luc/master'

Signed-off-by: Christopher Li <sparse@chrisli.org>