Revision ca9aaf5e30793dcea70208c83f72da526f6157c1

Committed on 06/07/2016 7:25 am by Daniel Clements <dclements@kaliop.com> [GitHub Diff]

Merge commit '74ac2ed'