Merge branch 'maint-0.2.6' into release-0.2.6

This commit is contained in:
Andrea Shepard 2015-06-10 15:03:22 +00:00
commit 0e939c1e00

Diff Content Not Available