Merge branch 'master' into develop
Merge remote-tracking branch 'origin/develop' into develop
upgraded graphs to new Limn 0.6.0 format

Change-Id: I9604758161b682db9f34c357809d07ea7eceda8b