Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 19:33:45 PDT 2014