updates from indigo_dev branch

[floweisshardt]

master branch is used for nightly builds (supported by https://nightli.es)

master branch should always be in sync with indigo_dev, thus merging....