Merge from OctoFalcon/astrid:master to alffrey/astrid:master on Sept 3, 2014