Merge pull request #1 from shepherdwind/master

Auto merge by kpm server
Merge pull request #2 from shepherdwind/master

Auto merge by kpm server
Merge remote-tracking branch 'gallery/master'