Merge branch 'GCI2010'