Merge remote branch 'jsnyder-tree/master'

Changes to compile on OS X.

base: noted in CHANGELOG pending 0.3.0 release

(0) -100 -30 -10 -3 +3 tip

mercurial