Merge latest fixes from mstum

This commit is contained in:
James Gregory 2014-01-28 19:56:42 +11:00
commit 15936d463a

File diff suppressed because one or more lines are too long