pull changes from master to dev on 2014-10-25

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1369: fix bug in which null trip dice impart null on unsuccessful trip attack
  * #1368: fix internal error bug when doppelgangers capture trip dice

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.