Merge pull request #1120 from ddunn2/dev-branch