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