Metaswitch/ralf — pull request #1 by rkd-msw (2014-01-31 14:56:19+00:00)
Title: [No review required] Integration

Merging integration branch back into dev. No review required as Andy and I have been collaborating and reviewing as we go.