Jim Ma
committed
on 17 Dec 12
Synch with trunk