Merge branch 'jims_annotate3d_update' into menard_finalsep2012