Commit a4827a5b5c2a9d2d8a35a5a76adcc9881a11b07b

Ben Straub 2012-07-27T11:17:21

Merge remote-tracking branch 'upstream/development' into test-merge