[Merge] lp:~jamesodhunt/upstart/bugs-1235649+1203595 into lp:upstart

[James Hunt]

The proposal to merge lp:~jamesodhunt/upstart/bugs-1235649+1203595 into lp:upstart has been updated.

    Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/bugs-1235649+1203595/+merge/191852
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bugs-1235649+1203595/+merge/191852
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bugs-1235649+1203595 into lp:upstart.