Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 19:58:46 PDT 2014