Merge tag 'v0.3.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jan 2016 17:53:04 +0000 (12:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jan 2016 17:53:04 +0000 (12:53 -0500)
Version 0.3.6


Trivial merge