orbitz Merge branch 'fix-dependencies'

Latest commit 6a139b6

Apr 30, 2017