Merge tag 'v1.4.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 18:15:51 +0000 (14:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 18:15:51 +0000 (14:15 -0400)
v1.4.6


Trivial merge