Merge tag 'v1.2.36' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:44:07 +0000 (15:44 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:44:07 +0000 (15:44 -0500)
commitabad315e5c8d3f2f19652f7458dad8a43a56f243
treea3b43972284b2daaf59d950f49ddf7095b9e87dc
parent2c8265ee5939be2eedda744fa7e30ddaa0657166
parent568a21208c3c526e14d23fd5143171983b6ed225
Merge tag 'v1.2.36' into develop

version 1.2.36