tree 525effbe0c1a70927d89ff67856c7ddd755e827e
parent 5f4142525a2f68d585bf59b06df1f4207989a34d
parent 6df31a1561ab5e2350e92b5f2bf833cb196000f4
author Frieder Schlesier <fschl.code@gmail.com> 1457208230 +0100
committer Frieder Schlesier <fschl.code@gmail.com> 1457208230 +0100

Merge remote-tracking branch 'upstream/master' into issue-304

* upstream/master:
  Fixes #302: Force update can cause a panic