Merge "Removing spurious ; from shader macro code" into devel/master