Merge pull request #255 from StefTweet/master

Final update references @ 04 06 2013
Merge pull request #256 from StefTweet/2.3

Finish update references @ 04 06 2013
Merge remote-tracking branch 'up/2.3'
Merge remote-tracking branch 'up/master'