Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 26 10:38:45 PDT 2014