Squashed commit of the following:

commit 81bedafb1f926fcb93cc4550295336c1ba85a5d4
Author: AKifumi Nakamura <nakamura.akifumi@miraitsystems.jp>
Date:   Wed Sep 18 16:59:28 2013 +0900

    test2

commit 6508c4505e2686dee6d67b9b914b2a0316a5ace9
Merge: 45aa222 2c7f4c1
Author: AKifumi Nakamura <nakamura.akifumi@miraitsystems.jp>
Date:   Wed Sep 18 16:54:04 2013 +0900

    Merge remote-tracking branch 'origin/master' into issue5680

commit 45aa2224f628a129bcc7432c631c485aeb188a07
Author: AKifumi Nakamura <nakamura.akifumi@miraitsystems.jp>
Date:   Wed Sep 18 16:42:37 2013 +0900

    test