Binaries for 3.0 release
Merge pull request #60 from khawkins/30_binaries

Binaries for 3.0 release
Merge remote-tracking branch 'upstream/master' into unstable_merge
Merge pull request #61 from khawkins/unstable_merge

Merging master back to unstable