Merge tag 'v1.2.17' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:55:10 +0000 (13:55 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:55:10 +0000 (13:55 -0500)
commitf067bb95b74ea609fe706518a6d51e6525a4194e
treec13a1ce9feb5cd47dc5bec461087f6fde7831909
parenta89247e1d27dcecfff1488ca7f2ef9963e143abd
parent63e5f82de4b24f6e0b14e48fe20d75d48bc3bd99
Merge tag 'v1.2.17' into develop

merge brach with hotfix 1.2.17