AssemblyInfo fixes.
Merge branch 'master' into no_solution