Sync'd branch releases/aurora with upstream @ Wed Sep 24 11:03:35 PDT 2014