New Upstream Snapshot - nototools

No successful merges for nototools