Fixes on behalf of https://www.pivotaltracker.com/story/show/68865816
Merge pull request #1 from pavel-zdenek/develop

Fixes on behalf of https://www.pivotaltracker.com/story/show/68865816