Commit 854b701c8a799a484ef48d8b595601ab29876b57

Edward Thomson 2015-08-03T15:02:02

Merge remote-tracking branches 'upstream/pr/3323' and 'upstream/pr/3329'