Commit ac7c073c77d7a4d956b2e8a22f4a9117efd3a928

Con Kolivas 2013-05-18T13:16:25

Merge branch 'master' into icarus-dev