Snapshot, taken from the master (20140623)

Signed-off-by: Akira Mitsui <murase.syuka@gmail.com>