Sync'd branch releases/beta with upstream @ Sun Oct 19 18:17:36 PDT 2014