Merge tag 'v2.5.5' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:40:41 +0000 (12:40 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:40:41 +0000 (12:40 -0400)
commitd610d8ffce69eea26bc41cce6b23a8fb291b5938
treeceb7d733dc8b309b926513b149c92c34340e776b
parent9a21eecd626a68e1da516c8f8f4384b3a876f2f0
parente89c063e269ef84d95349f3ac3612560d88c61bc
Merge tag 'v2.5.5' into develop

Updated to 2.5.5