Commit 19c044a17dc4a4fcc552d88ea318062782955a13

Vicent Marti 2012-11-12T14:23:17

Merge remote-tracking branch 'ben/local-transport' into development