request for master to be merged into the wms branch

Is it possible to bring master into the wms branch today? When will the wms branch be pulled into master?

I merged master into wms.

So wms is done besides for unit tests. I'm busy on another project, so
it could be a month or more before I get to it. If you would like
contribute and put in some tests, then we can get it in sooner.

We don't want to depend on external resources for the tests, so my
general thoughts would be have a local capabilities file, make sure it
parses correctly and maybe have it load a local image from the file
and make sure its correct. We probably also want to check error cases
with bad files, missing files, etc.

Thanks Tom. I think I will look into creating these tests, so I don’t have to keep asking you guys to rebase the branch.