Can someone else please pull in #288, resolve conflicts and rebase it into one commit? When I attempt to do this, the "author" gets reset to me instead of Kevin. My git knowledge isn't good enough for multi-commit PRs that include conflicts with develop.
-Kirk
