Comment 5 for bug 1356477

The working branch user/gmcharlt/lp1356477_messy contains the code currently being tested by our customer. As the branch name implies, this ain't neat; when it comes time for a pullrequest, we'll rebase and clean up.