commit 578d342145ed301cb87f0f9544ae98a052269c42
Author: dzhuang
Date:   Wed May 13 18:14:35 2015 +0800

    merge changes.