Commit 69f36358b134fc52be771d50c412748630621ad8

Con Kolivas 2013-05-19T11:36:18

Merge branch 'master' into icarus-dev