Sync'd branch releases/beta with upstream @ Fri Oct 17 05:43:43 PDT 2014