Merge remote-tracking branch 'upstream/master' into observe_ja
Merge remote-tracking branch 'upstream/master' into observe_ja
Fixed tiny typo on locale resource
Added O.o() description string in Japanese
Merge pull request #1177 from agektmr/observe_ja

Fixed a small typo in Japanese locale resource