Sync'd branch releases/aurora with upstream @ Wed Oct 22 18:41:41 PDT 2014