BugLink: http://bugs.launchpad.net/bugs/800660

From: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>