Please take a moment to fill out the following: Fixes issue # Changes Proposed in this pull request: PR Checklist Has tests (if omitted, state reason in description) Rebased on top of master at time of PR Consolidate commits as makes sense