Merge tag 'v1.2.31' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:06:17 +0000 (10:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:06:17 +0000 (10:06 -0500)
v1.2.31


Trivial merge