Upgrade to apm 0.94