This commit is for a pull request message resolve, so it doesn't require any changes
Merge pull request #2 from jfking/new-dev

BugzID: 1284 - is this it?