Sync'd branch releases/beta with upstream @ Mon Oct  6 05:37:41 PDT 2014