[sugar-artwork/f17] (2 commits) ...Merge branch 'master' into f17

[Peter Robinson]

Summary of changes:

f505c25... 0.96.1 (*)
  4cfa306... Merge branch 'master' into f17

(*) This commit already existed in another branch; no separate mail sent