This PR simply re-bases develop off of master. This is helpful because there are some changes, that have been made in master that are missing in develop and so any PRs that touch those lines become more complicated when trying to follow the "create a PR into develop" procedure.
This PR simply re-bases
develop
off ofmaster
. This is helpful because there are some changes, that have been made inmaster
that are missing indevelop
and so any PRs that touch those lines become more complicated when trying to follow the "create a PR into develop" procedure.