Sync'd branch releases/beta with upstream @ Wed Oct 15 18:28:55 PDT 2014