Commit d514be9f2813866926d6085a326b0a814e30841e

Kentaro Fukuchi 2014-06-22T02:11:53

Merge branch '3.4'