Commit 1d4519f860d3f6bf06dd1815929c7375d1f43b35

Con Kolivas 2014-04-23T08:19:54

Build fixes