pull brandon-development to master... even though the comments are more or less missing.