[Merge] lp:~cjohnston/ubuntu/trusty/horizon/1396318 into lp:ubuntu/trusty-updates/horizon

[Corey Bryant]

Review: Approve

Looks good to me and tests out ok.  I posted a screenshot of running with the fix to bug #1396318.
-- 
https://code.launchpad.net/~cjohnston/ubuntu/trusty/horizon/1396318/+merge/243316
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~cjohnston/ubuntu/trusty/horizon/1396318 into lp:ubuntu/trusty-updates/horizon.