Fixes for October 2014 release

Fixes for forthcoming release of Galaxy. These are pretty tricky - so see individual commits for details. This also fixes all of the tests for me.

Ping @simleo @nsoranzo @martenson.