Sync'd branch releases/beta with upstream @ Mon Sep 29 14:32:34 PDT 2014