Merge tag 'v1.1.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:57:59 +0000 (09:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:57:59 +0000 (09:57 -0400)
v1.1.20


Trivial merge