Sync'd branch releases/beta with upstream @ Sun Oct 19 21:05:34 PDT 2014