Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 10:12:38 PDT 2014