Building on my Macbook Mountain Lion
Merge commit 'f7c59aa'