Sync'd branch releases/beta with upstream @ Mon Oct 13 17:59:39 PDT 2014