Sync'd branch releases/beta with upstream @ Fri Oct 17 17:38:39 PDT 2014