Integrate 0.96.6 code.
Include remaining changes from new release.
Add .dmg and .app generation rules.