Merge circster fix from release_15.03 to dev

This commit is contained in:
Dannon Baker
2015-03-31 17:39:48 -04:00
3 changed files with 52 additions and 48 deletions
File diff suppressed because one or more lines are too long