Merged in default (pull request #613)

Fix some g-ir-scanner warnings

Approved-by: Gary Kramlich