Sync'd branch releases/beta with upstream @ Mon Oct 13 09:38:32 PDT 2014