Merge tag 'V1.2.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:35 +0000 (12:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 16:26:35 +0000 (12:26 -0400)
commitb805ae5d36bf43045e63db25ac9b847a330f5801
treeb3ef33b52c39fed7eabb611689e7bf9ad13a6b51
parentaad00bc53f3c2469fe55fedf341999ddcf12c85d
parent8013d06b850656242823915308edaa6263de125f
Merge tag 'V1.2.18' into develop

v1.2.18