Satisfy the Udacity testing engine.
merge branches