Wacky, waving, inflatable, arm-flailing, indirection.
Merge pull request #40 from jordandukart/7.x-FLVC-60

Wacky, waving, inflatable, arm-flailing, indirection.
Fix couple bugs @qadan found in QAland.
Merge pull request #41 from jordandukart/7.x-FLVC-60

Fix couple bugs @qadan found in QAland.