Merge branch 'terencehill/ca_fixes_and_more'
authorMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 11:29:07 +0000 (22:29 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 11:29:07 +0000 (22:29 +1100)

Trivial merge