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