Resubmitting pull request to development branch.

derp