Sync'd branch releases/beta with upstream @ Sun Oct 26 17:09:32 PDT 2014