Merge tag 'v2.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:59 +0000 (13:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:59 +0000 (13:47 -0400)
v2.0.5


Trivial merge