Sync'd branch releases/beta with upstream @ Sun Oct 26 07:56:39 PDT 2014