Merge branch 'stable-3.1'

* stable-3.1:
  Do not reject commit upon connectivity problems

Change-Id: I97617534b56c97182f60db0122a4feffd3e54de4