[Note from Austin: I think @edolstra forgot to merge this to master.] (cherry picked from commit 02b056c5b180b4b8ba22ddc3061d78258e2ef98f on release-14.04)
[Note from Austin: I think @edolstra forgot to merge this to master.] (cherry picked from commit 02b056c5b180b4b8ba22ddc3061d78258e2ef98f on release-14.04)