Merge tag '4.2.3.20121017-Final'
Merge branch 'release/4.2.3.Final-1'
Merge branch 'release/4.2.3.Final-2'
Merge branch 'release/4.3.0.Final'
Merged the master branch into develop