Merge pull request #2034 from metalivedev/1969-cherrypick-fixcommitformat

Fix #1969 formatting, add information about multiline json
Merge branch 'master' into bump_0.6.4
Bump version to 0.6.4
Merge pull request #2255 from dotcloud/bump_0.6.4

Bump to 0.6.4
Merge branch 'release'