Merge remote-tracking branch 'refs/remotes/projectgoav/master' #11

Closed xfischer closed 8 years ago