change-file 789

Change-Id: I80b5e2f2a8c8bcebf97a0e78edce138a9ef67550
Merge branch 'master' of https://github.com/vmihellhale/the_grand_high_repo

Conflicts:
	change-file (resolved - now 789)

Change-Id: I528b08e9be44d88e2698ab641d75d44f7bbb279c