Updated for 10
Merge remote-tracking branch 'origin/Optickle2-jm' into Optickle2-yuta