Southpaw-TACTIC/TACTIC — pull request #88 by oboreo (2014-11-25 19:29:27+00:00)
Title: BRANCH SP-1265:

resolved conflicts