Commit 488b2ba5e4a7ceb46bc62c304d96e8c4e042bf61

Con Kolivas 2013-11-14T21:25:52

Merge branch 'master' into bxf