Jack-Ji/docker — pull request #1 by Jack-Ji (2014-10-20 02:17:12+00:00)
Title: merge from trunk

merge from trunk