bitte
bitte copied to clipboard
Merge stuff from develop branch so that we can get rid of it
trafficstars
I rebased the develop branch on master and saved it in this new branch to avoid an extraneous PR.