Merging r623 from 2.0.x branch into trunk (2.0.6 ChangeLog updates)
Merging r623 from 2.0.x branch into trunk (2.0.6 ChangeLog updates)


acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core,acmorrow/pion-core