Merge into alffrey/astrid Sept 5, 2014