Merged in default (pull request #652)

Use structs instead of adjacent name-value GList elements

Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich