Sync'd branch releases/beta with upstream @ Sat Oct 25 19:45:45 PDT 2014