Added all the lines from the other pull request together at the end, …#16

Open

teeks99 wants to merge 1 commit intoossf:mainfrom teeks99:combined

+17

Commits on Jul 13, 2015

Added all the lines from the other pull request together at the end, plus some others worth investigating
teeks99
committed