Squashed commit of the following:

commit eb06237720ae4148b3bfd792847b0eb28f613749
Author: Hayaki Saito <user@zuse.jp>
Date:   Fri May 2 19:00:48 2014 +0900

    Fix a build error on travis