Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:35:08 +0000 (09:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:35:08 +0000 (09:35 -0400)
v1.1.17


Trivial merge