Closes #311
Merge branch '2.1M2' of https://github.com/denimgroup/threadfix into 2.1M2