Echelon9/cxbx-shogun — pull request #10 by Echelon9 (2014-06-23 12:55:44+00:00)
Title: Correctness fixes

Merger the correctness-fixes branch into master.

This will allow a move to the 'Feature Branch Workflow', rather than having all fixes/changes held away from master.

The number of commits here is significantly more than would typically be desirable going forward.