Stuff

Signed-off-by: Jason Myers <jason@jasonamyers.com>
Merge remote-tracking branch 'upstream/master'