wisesmile/2014-10-22 — pull request #1 by wisesmile (2014-12-19 18:03:22+00:00)
Title: merge develop into master from github

Just another test.