INN/Largo — pull request #214 by danielbachhuber (2014-04-17 20:19:02+00:00)
Title: Sync develop against master

There have been changes committed to master that need to be on develop too.