Duplicate PR for Issue 1446

Will Travis run end to end tests? Hmm...