Sync'd branch releases/aurora with upstream @ Wed Oct 15 18:11:38 PDT 2014