Sync'd branch releases/aurora with upstream @ Wed Sep 17 14:10:37 PDT 2014