Merge tag 'v2.1.23' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:31:17 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 13:31:17 +0000 (09:31 -0400)
v2.1.23


Trivial merge