Adds TCP check for Redis
Use new format mysql pid file
Bump version number
Merge remote-tracking branch 'remotes/upstream/master'

 enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.