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