Merge tag 'v1.2.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:35 +0000 (08:54 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:35 +0000 (08:54 -0500)
v1.2.17


Trivial merge