merge(): Pull Request tawashley:master from furzeface:master