merged official 04/04/2013 latest commit 72cc3576d3