Merge tag 'V1.3.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:08:50 +0000 (09:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:08:50 +0000 (09:08 -0400)
v1.3.6


Trivial merge