back ported bug fixes found during 2014.03 testing
Merge pull request #30 from daniellemayne/2013.07

back ported bug fixes found during 2014.03 testing