Merge tag 'V1.2.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 14:44:09 +0000 (10:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 14:44:09 +0000 (10:44 -0400)
v1.2.17


Trivial merge