https://bugzilla.gnome.org/show_bug.cgi?id=691944 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 397e673446e86a9116cb7396ea094e9f8b46986e)