Merge remote-tracking branch 'origin/generic'
Git User [Mon, 29 Sep 2014 10:31:37 +0000 (06:31 -0400)]

Trivial merge