Merge conflict fixes caused by unintentional merges

• Merge branch 'master' into deploy da71c28
• Merge pull request #20 from browserstack/merge-conflict-fix a065f0b
• resolving merge conflict 9a22e31

v1.1.4...v1.1.5