Merge pull request #256 from StefTweet/2.3

Finish update references @ 04 06 2013
Update references

with last commit beetween 30 05 and 04 06
Merge remote-tracking branch 'origin/2.3'