pull changes from master to dev on 2014-12-04

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1454: fix internal error bug caused by morphing/doppelganger attacks on twin swing dice
* Not user-visible: none

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.