Fixed possible EOL in google results, for real this time! :-)
Merge remote-tracking branch 'parent/master'