Sync'd branch releases/beta with upstream @ Wed Oct 22 16:38:41 PDT 2014