Nikola auto commit.

Source commit: db3cad010d2f8135b65d50be003761f6f4b829c9
Nikola version: 7.0.1
Nikola auto commit.

Source commit: fd907353b156416b7f6625537016a91251437abf
Nikola version: 7.0.1
Nikola auto commit.

Source commit: cf3b926b1a69aa705e9f700554c1e6e6c8b9baaa
Nikola version: 7.0.1
Nikola auto commit.

Source commit: 89d856bc07b1abd1944af9ebdbef49434ff28a3f
Nikola version: 7.0.1
Fix up a merge conflict