Merge tag 'v2.1.6' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:27 +0000 (14:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Jun 2016 18:14:27 +0000 (14:14 -0400)
removed unused code and comments


Trivial merge