Feedback #5
Merge branch 'master' into branch_release_20140410
GCP-8051 (truncated backup sql fix)
GCP-8051 (bug fix)
GCP-8239
GCP-8239
Merge remote-tracking branch 'origin/master'