Merge branch '03042013' into develop
03042013