Sync'd branch releases/aurora with upstream @ Fri Sep 19 10:37:38 PDT 2014