Merge branch 'contrib' into 0.2.1-FINAL