Merge tag 'v1.36' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Feb 2015 19:24:58 +0000 (14:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Feb 2015 19:24:58 +0000 (14:24 -0500)
Version 1.36


Trivial merge