Reviewed-on: http://git.keeper317.com/Keeper317/open-conflict/pulls/6
Reviewed-on: http://git.keeper317.com/Keeper317/open-conflict/pulls/5