Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 20:15:43 PDT 2014