Sync'd branch releases/beta with upstream @ Fri Oct 31 05:50:38 PDT 2014