weekly merge to bring master branch up to speed with development branch