Merge tag 'V1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:17 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:17 +0000 (14:15 -0500)
v1.1.17


Trivial merge