Merge pull requests from deflaux/master