Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 6 Mar 2017 14:08:54 +0000 (09:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 6 Mar 2017 14:08:54 +0000 (09:08 -0500)
v1.1.17


Trivial merge