Merge tag 'v1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:47 +0000 (11:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Aug 2016 15:29:47 +0000 (11:29 -0400)
commitfeeebb7451c0c6656e66e17a7038d5fc85197fbb
treea088bb7cd870e7d6fb28042e0eff5d1dcb7f6e28
parent1f27baf6b9014c3b9a5c65a3b87d06e7e78aca53
parent0838f8c0d3e07c8acbfb28f1853d1e0bdafa5ee6
Merge tag 'v1.1.17' into develop

v1.1.17