Merge tag 'V1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Aug 2014 18:33:08 +0000 (14:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Aug 2014 18:33:08 +0000 (14:33 -0400)
version 1.1.2


Trivial merge