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