Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 12:03:44 PDT 2014