Sync'd branch releases/aurora with upstream @ Fri Sep 19 13:58:35 PDT 2014