BugzID: 1366 blah blah
blah blah no bugz id here
Merge pull request #1 from jfking/new-dev

New dev