Added new line at the end of the file, and updated to latest upstream.