Merge branch 'release/1.36' v1.36
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Feb 2015 19:24:43 +0000 (14:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Feb 2015 19:24:43 +0000 (14:24 -0500)

Trivial merge