Mr-Dave/motion — pull request #18 by tosiara (2014-07-23 15:21:28+00:00)
Title: Whitespace fix for better merge with upstream

Whitespace fix for better merge with upstream. And also avoid noisy warnings about trailing spaces etc