Merge fredbcode:master