Merge into alffrey/astrid from OctoFalcon/astrid on Sept 5, 2014