Merge remote-tracking branch 'gist/master'