Added Drive targets to export list.
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	CMakeLists.txt
Merge remote-tracking branch 'origin/next' into drive_split
Merge remote-tracking branch 'origin/drive_split' into next