Merge branch 'master' of https://github.com/paulczar/nova

Change-Id: I1082cbc7066abebf258d9f2bc777f9fbf50e61bc