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