Update based on newest changes from upstream. Signed-off-by: Christopher Snowhill <kode54@gmail.com>
Please remember to unpack the archive before building, and if it is updated by a future version.