Merging development and master

We're merging these two branches because of an error we encountered.