Review pull request, DO NOT MERGE!

* Should automatically merge;
* Should pass Travis.