tabletcorry wants to merge 3 commits into loggly:master from tabletcorry:master