merge branch 20130830 #15

Closed yamanetoshi closed 11 years ago