[Merge] lp:~mtmiller/ubuntu/wily/octave/fix-build-and-break into lp:ubuntu/wily-proposed/octave

[Mike Miller]

Thanks for your review anyway. It's easier for folks with upload rights to take care of these changes, looks like both of my changes have been taken care of by others now. Thanks for your hard work!
-- 
https://code.launchpad.net/~mtmiller/ubuntu/wily/octave/fix-build-and-break/+merge/266672
Your team Ubuntu branches is subscribed to branch lp:ubuntu/wily-proposed/octave.