Review main Merged

13021[TASK] Improve sys_note code

Georg Ringer CR +2 V +2 Normal +172 −74 updated 06/03/13, 20:49