Shou Matsumoto - 2011-11-10

Done in commit 2187