Merge latest bugfixes
authorMichael McMaster <michael@codesrc.com>
Sun, 18 May 2014 03:57:01 +0000 (03:57 +0000)
committerMichael McMaster <michael@codesrc.com>
Sun, 18 May 2014 03:57:01 +0000 (03:57 +0000)

Trivial merge