Merge branch 'master' into tosca

Signed-off-by: Hashir Mohammed <hashir.mohammed@riftio.com>